Merge "Snap for 11692525 from 4811a5bda0ba56ae4f0a09882fa3140173e7ede3 to sdk-release" into sdk-release