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

Bug: 112535855
Change-Id: I4c2e12ca7dddf06d2e2abec0ee357df65dbcdea3