Merge "Snap for 11724015 from 5e073aa662a9e6a0c1be8f9810898bc2acf57930 to sdk-release" into sdk-release