ref: refs/heads/skia/more_retries
