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

Bug: 112535855
Change-Id: Ia449b546a99baca42895da5a531fde11b3057a59