Merge "Snap for 7110675 from 21474550bc37ccb8524dc49c702b1f735376f5eb to sdk-release" into sdk-release