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

Bug: 111615259
Change-Id: Ifee8c187c99abad5c496eca2b5bb6f8b8f857ceb