Snap for 11785460 from 23e095884b2e3db4c232695686955baded31d121 to sdk-release

Change-Id: I3d16506e0f14e84d0dea9509a47c7b5fd0d1420a