Merge "Snap for 6877830 from 53b6c8251ec9883131d8272444d28a7b6f75df5a to sdk-release" into sdk-release