Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd am: 2886890793
am: 5cba3b343f

Change-Id: I79f96c13475ef98c6457f5125bd1dd752f0a32db