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

Bug: 112535855
Change-Id: Iebbfe1ff37d838ce4a359368be6adce2f45c4077