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

Bug: 111615259
Change-Id: I863b0fcbfe9da2500dbad5287d9ab8bcd3939821