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

Bug: 112535855
Change-Id: I55e1f7ee129d0c506c4283867ed07e26de75e477