Merge "Correct message length calculation while sending SMS" am: 65f3adbe57
am: 42d14017b0

* commit '42d14017b05650397b6c5133d09b040aa2012e4c':
  Correct message length calculation while sending SMS

Change-Id: Ie7299ec9ae3b03fb72b1a35cbc5cfd96d47be6dc