Merge "import: Fix wrong/unspecific type hints in UploadSourceAdapter"