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

Bug: 112535855
Change-Id: I9ea7908494f01825613a018feecd6dab73e155ba