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

Bug: 111615259
Change-Id: Ib3b0242151129735d1f186c89f6ca711df50429f