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

Bug: 112535855
Change-Id: I6de62d9056373705715ac11ede703bf48e689008