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

Bug: 112535855
Change-Id: Ida7832f9785893e30a18f83f5b408a76577eed35