Merge "Snap for 9979206 from 229d3d27d8cddd0eea9b6eaa1a5d541473631c12 to sdk-release" into sdk-release