Snap for 7110675 from e12f6e0b9422e8e8cc21b681df9a0b918131a99f to sdk-release

Change-Id: Iba06835d3dc31e8312894fd69f44557474c3f545