Merge "Snap for 9679998 from 57d67abbd9845d2d26f0a2287b115bc87659d96c to sdk-release" into sdk-release