Merge change 2758 into donut

* changes:
  Fix concat SMS for GSM.