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

Bug: 112535855
Change-Id: Iefe367c8596a2ea6afa75823d0e84ee2bae86689