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

Change-Id: Ie4f86c9a8f764be4b28cdcd87e4679d87c9b0fca