Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: Iafb12a03eff152267cbf825dc5d0948a816aeee0