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

Change-Id: Ifab5e83003ac01def432e74b7870b93cc885569e