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

Change-Id: I6477a6f4b440ceb6a7344e5d4d8ffdda6a8b4e58