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

Bug: 112535855
Change-Id: I23038ca229e8eb8f4dfe2824807b78fd40dce976