Merge "Snap for 6660490 from 3f0ca6ed17e03fb19b8a5d3d30cebe4dff50fa19 to sdk-release" into sdk-release