Merge "Snap for 6198741 from 4be5df0fc7c017e762914446c3edb9e6e312a5d0 to sdk-release" into sdk-release