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

Change-Id: I0b9a66a45c692b2e47a4e4be03a815147d7fd697