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

Bug: 112535855
Change-Id: I0784a1178201c213926deb5cb4301f8cdfcae22a