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

Change-Id: I07c839d6c1ef9860dd70d999e92efb1f6bbaa283