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

Bug: 112535855
Change-Id: Id3ea308ccbca6bf798fe4356fdb5ee37f0cd90ff