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

Bug: 111615259
Change-Id: I70a56502f9543109971a1534073cbdcce3dff91f