Merge "Cleanup : don't mix seconds and milliseconds in retry delays"