Change-Id: I33f7dc30b10a617ae4784f067491ab01b27b7733
-> Using separate assets for removing and uninstalling Change-Id: I183967c3ca482531ae28f71cd9053b673c6a8d03