Snap for 11785460 from 6a78d720796b9b80eec8bff0025ab12c2e9d822c to sdk-release

Change-Id: I0c1faf07334225f6c3b0b275f8f423359e328e13