Merge "Add timeout for dump_file."