Fixes #938 (cherry picked from commit 3f1d28c3833e6b868152149ed02b3fb8c54eccef)
MultipartBody.Builder