Merge "Pass correct parameters to API sendMultipartTextMessage"
am: b29e727b32

Change-Id: I3aa4f8fd4e528165b9338c44132f0b2b5f0342c2