Merge "Snap for 6660490 from 021f5e9d9d8b78ac3844b72b20dc81f092826590 to sdk-release" into sdk-release