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

Bug: 112535855
Change-Id: I890e873e956d67fcc7decc9fc026c7c76c036fea