Merge "Snap for 8952093 from 9558e6ac2e10ab0fef46fdd14187b840555f86f4 to sdk-release" into sdk-release