Merge "Snap for 6660490 from 52e51c22ac7e111fad6e6e8e175bfe0e486f4979 to sdk-release" into sdk-release