Merge "Remove default_params_with_timeout_values variable"