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

Change-Id: Ib858bfb1c91adadc703491cca2fae4a5ad7fea03