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

Bug: 111615259
Change-Id: I2e8063ac429e5a4136750d562a9e8e5e71bfb5c1