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

Bug: 112535855
Change-Id: I69e918f5ea213e0616bf832307572b060b2ef979