Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd" into stage-aosp-master am: 9dcf614397" into oc-dev-plus-aosp am: d7e6de2267" into oc-dr1-dev-plus-aosp
am: f16583765a

Change-Id: I61910fcca40a0e14100dbc38c80a19c20a07344d