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

Bug: 112535855
Change-Id: I1ba00379ca307f44a6430e516b474983e4c1dd32