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

Change-Id: Idbe95e5266fea4989e9b98d42b0606099563808f