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

Bug: 112535855
Change-Id: Id6a0f71bed88d3d99c7155310c0079677a3473eb