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

Change-Id: Id87d0d8277f3b7a6a42013f92cef0a3dff0f2c70