Merge "Snap for 4429331 from 42246bba6f931498161e7bff9f1e15fd391ce5b4 to sdk-release" into sdk-release