Merge "Snap for 8005954 from 0ba11cd54d07ed323855b76403cd843b3bf90089 to sdk-release" into sdk-release