Snap for 9550355 from 9aadba0de2095399e15d4e52bcc0f20ed6bbb875 to sdk-release

Change-Id: I719d478317440bd00f9e7248fe3e8b2f70be4923