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

Change-Id: Ia01e6cd61b2332724e4bab731d620e4d597f2a1c