Merge "Snap for 9679998 from ff0c2792e3a5f8b38211d6a28f518df7df321907 to sdk-release" into sdk-release