Merge "Add 'api-error-ratelimited' message for UploadWizard"