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

Change-Id: Ieb6335c44687a206964f0e0c72541dda605beaa2