Merge stage-dr1-aosp-master into stage-aosp-master am: 08a2b850a5 Change-Id: Ibfc8c0b3a4e923ed79ad0964e9deecbd25db4b3f