Merge "Snap for 11724015 from 673d9a878646bb12ba0406ee35b9f05848de6cc0 to sdk-release" into sdk-release