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

Change-Id: I957b7bb1623fa95681d7d7504dbd5232bc7d7c94