Merge "Correct message length calculation while sending SMS"