Merge "Snap for 12815566 from ca54a0281526d619b58e2062d96a009f7d2ef05b to sdk-release" into sdk-release