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

Bug: 111615259
Change-Id: Ia09c023274f295ac82d3affc55d1a333d92444d8