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

Bug: 112535855
Change-Id: I08eacf6f10bdc371dfa854a4eb404cf914eef8d0