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

Change-Id: Icf0ea0d7a63150fd1ea790521299575bbe7ffb4b