Snap for 6660490 from 28f8a95f08b8aa4a9f4ccad4096736b50e283473 to sdk-release

Change-Id: I10d6626ab38ca6b04c3dda0f425a1ec2bfb5dff1