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

Change-Id: Iacad4e34a95a0c07fe21dc80f50cd393929c0e96