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

Change-Id: I2874add0282a2a6b01c773d15b23d192a999b2ff