Merge stage-dr1-aosp-master into stage-aosp-master am: 4a1070631d
am: b183e8719d

Change-Id: Ic47ece8f4d262c4095a66ad80db7a4d9079292b8