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

Bug: 112535855
Change-Id: Ic6da17c971f2a62af6c5974a48024e4c7f4a1ff0