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

Bug: 111615259
Change-Id: I99ed0f3718453fb70245aeeecb59ec8b0420cd40