Merge "Snap for 11819063 from 72217fc46b6da990facf7bd4c9c301e321d4545f to sdk-release" into sdk-release