Merge "Pass correct parameters to API sendMultipartTextMessage" am: b29e727b32 am: 817c987602
am: 1bd7ed316c

Change-Id: I2de2598bcec916c836ae639ed1384abd232123dc