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

Bug: 111615259
Change-Id: I45ab414b0ca5da5901c2da9e1f44fa9f017aef49