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

Change-Id: I8068c5f0b1e644b920635530387fce8d41259983