Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: a9b192c074

Change-Id: Iaa348243d32639ff35959e8dced7eb527c2f6b97