Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 03ecdd2848

Change-Id: I05b817560a6415ef163d69988a51bfc725b08b97