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

Bug: 112535855
Change-Id: I8cb359836e326b226b59c7d52d8cefd3b20f0bb3