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

Bug: 111615259
Change-Id: I6e71868def865b2c8c9c2e8ad95c63f7723ab755