Merge "Make upload_source_file and upload_source_url more specific"