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

Change-Id: Ifd30ddcf906f80e19e99ff7a8272d50ff8734756