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

Bug: 112535855
Change-Id: I965c792ced13d17fa70c26fe6fb062aea975d474