Merge "Postpone error until no more retries are available" into nyc-mr1-dev