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

Bug: 112535855
Change-Id: If8556cd84881de6e08c970496c9e2e4af6af07f2