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

Change-Id: I0757cbf92a049cc20226172b6d3261f5ef23b362