Merge "Fix UploadService unittests."