Merge stage-dr1-aosp-master into stage-aosp-master am: bc4868b607
am: d12393e529

Change-Id: I3fb671e9c64a8c24380d8e03dee0a609ac55e277