Snap for 7110675 from 4834863aa6a9e942504e5aca9b44c7bc7e27539f to sdk-release

Change-Id: I7ab38455d23eacd018fa8ac956737cefab7f50e1