Merge "Snap for 11211409 from 26ab3b21df544c9895219c76d7ff5eeeee829dad to sdk-release" into sdk-release