Merge "Snap for 13270875 from 12f80e62b22d7437a559fdf627fc00bf4a99e1bb to sdk-release" into sdk-release