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

Change-Id: I922f53fa48cb0acaa8c663202d7b1e5ffc2683f9