Merge "Snap for 6533464 from 86bd1927968a016055be23df358881162f37234b to sdk-release" into sdk-release