Merge "Snap for 7550740 from 40a0664b84559a2d162d08f085cf8d95eb6f99e3 to sdk-release" into sdk-release