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

Bug: 112535855
Change-Id: I58405715a1ebce047ee50f22e2645390e5d052d6