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

Bug: 111615259
Change-Id: Ib388606168aeebd8efd0396a825cd6fda5898f0a