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

Bug: 112535855
Change-Id: I670eec60564aaa6efadabcee3cefa821c3206541