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

Bug: 111615259
Change-Id: Ica914087442628febc4671ca3c20e555a234a677