Merge "Snap for 7945246 from efcdeaeb5f803c073d1cef3299d6e9334d66868a to sdk-release" into sdk-release