Merge "Snap for 4429331 from 224f3f566bda37f2ee0a7bafa75a2d815c9e9687 to sdk-release" into sdk-release