Merge "Snap for 7236715 from 4e94784b1485482ff3a454eb73ebccfc08153c24 to sdk-release" into sdk-release