Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 751a1019e9 am: 6a7faca870
am: 21d4915ffe

Change-Id: I147617da071224012d3094b225703b80e5cd3c43