Merge "Get rid of separate download_file type."