Merge "Fix CONTENT-LENGTH header in WebRequestUpload"