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

Change-Id: Ied4c74271b13786df7038ee3a0937673c84cf251