Merge "Snap for 8005954 from 6021e072e7891ca5aaa33245c27b996927ca5c79 to sdk-release" into sdk-release