Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 26715ec73c

Change-Id: Ia5b5a38bbb2aeb513ec286be2f4a22f1cc0a4dd2