Merge "Snap for 6877830 from 49b77d22c4aa5c41d72e579615817072b49ead7a to sdk-release" into sdk-release