Merge "Snap for 6686656 from 5bf1097c4ffae53374f5259735e19c0a1be3d0b9 to sdk-release" into sdk-release