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

Change-Id: I6b5e764a2b8653937c0edaaa6b9450973a38dac4