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