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

Change-Id: Ic71e17f566fc836d8eec417e52b40f5793adab75