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

Bug: 112535855
Change-Id: I4bca77938b8bf64518bee22b31c96b972523ebd5