Merge "Snap for 8074123 from 3c576df13774a2c16bf2108bfbb78be4e728cbf8 to sdk-release" into sdk-release