Merge "Add missing access modifiers in UploadBase"