Merge "Snap for 11211409 from 199709a671183465c94895e4d72ce9fccd2d46ac to sdk-release" into sdk-release