Merge "Snap for 9979206 from 35c48f19480017840193b10b25c420f625fcf3d0 to sdk-release" into sdk-release