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

Change-Id: I9ca82a806160c3bfdcb57a1bd27d1d7bef42a3b1