Merge "Use ForeignFileRepo information for foreign uploads"