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

Bug: 112535855
Change-Id: Icdcae9e711c6a2f979312a56b5ddc67b2a58f4e8