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

Bug: 112535855
Change-Id: I0df5b461c2b55fe4467fad577afd0be08a912c32