Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd" into stage-aosp-master am: 9dcf614397" into oc-dev-plus-aosp am: 587eeda675" into oc-dr1-dev-plus-aosp
am: 595df4ca8e

Change-Id: I495ebe14aba461bb4fc296a1c50a90ea91d23c86