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

Bug: 111615259
Change-Id: I904c142310d4a0e5e7caf853af250db55be7743e