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

Bug: 112535855
Change-Id: Ie3bfafabd9db09b317ca6b3435bfdf017a646594