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

Bug: 112535855
Change-Id: I281ee2779af72627e2a4179bd51f16febc7c3137