Merge "Throttle error messages about mismatched bucket"