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

Bug: 112535855
Change-Id: Ie628d04bd3a8c618ca7db558222fec12fdf45e90