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

Bug: 112535855
Change-Id: I53fc789c320911684aa4fea56585d942f01e77e1