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

Change-Id: Ibaee6f5f77af28392f99acc2050e59c29fa82a24