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

Change-Id: Icc132a3e07dd437f8565910af3b58b57aded6022