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

Change-Id: Ide9e745efe8952ac27fb9fb79053557aa6a1caef