Merge "Return HTTP 429 when thumbnailing is throttled due to too many errors"