Merge "Snap for 11699450 from b34cd2e4371556e913ad9801a924a891c74d1463 to sdk-release" into sdk-release