Merge "Snap for 11637895 from 59d5f58dfbe2fa1e31ec41d36e3667cbd32bfb3d to sdk-release" into sdk-release