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

Bug: 112535855
Change-Id: I9ed1c83e0ebc8f88cfa40e60ae8529601952ac16