Merge "Move WebRequestUpload class to its own file"