Merge "Fix retries when server doesn't support range requests." into jb-mr1-dev