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

Bug: 111615259
Change-Id: I81bcd2b99eeb97da4cae2ac779b364a9c5d743c9