Merge "Snap for 6533464 from 9ef7df4ae291e5e16e3d6c8bd51bcc8eb81e1b50 to sdk-release" into sdk-release