Merge "Snap for 11598262 from 572cf5dfcf50b66565dfc987f81152d7e9c98e6d to sdk-release" into sdk-release