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

Change-Id: I2ac3dd613d6e334aad9d88479ef682bd2ae23bb1