Snap for 9550355 from 0f4bc2fde7cb4b50ebcb6f768e1f99c9cd8f5b43 to sdk-release

Change-Id: Idab1669cb14fed92a8de2f51a95da22599997f10