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

Bug: 111615259
Change-Id: If08344c69ea1114010e316145eaa993e75c8de01