Merge "Snap for 9979206 from 9f788d5119cadb51085dd29ad5db88848f0f07d6 to sdk-release" into sdk-release