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

Change-Id: Ibba03d9e2462ed5b7566288daf806df062de2740