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

Bug: 112535855
Change-Id: I8f58e24c54f0ccad85729d3363d3b2ee193cf29f