Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6 am: 28868907" into oc-dev-plus-aosp am: 37b52721" into oc-dr1-dev-plus-aosp