Merge stage-dr1-aosp-master into stage-aosp-master
am: f5250b5907

Change-Id: I52cffc3e40d9aa3e3a1f2456c679dcfbef324540