Merge "Snap for 6290619 from 9cbdb82e0d061084cc9c6cf8e80768711350a541 to sdk-release" into sdk-release