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

Bug: 112535855
Change-Id: If507a27e48aba8cca731f67ffdf01f57b565f64d