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: 9031acdf5b

Change-Id: I5c38e4794488a67d7621e8d978f8d9b0cbea275a