am 6190fe6e: Merge change 2758 into donut

Merge commit '6190fe6e7d7c8a917472637f5ab2fb21fc8a6eea'

* commit '6190fe6e7d7c8a917472637f5ab2fb21fc8a6eea':
  Fix concat SMS for GSM.