Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I6a7176c7d4d0e01a53693f5f6961400e67ba1344