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

Change-Id: Ie84b1bc703d2bc9f52318c40e67cc98755972141