am ecbbecf6: Merge change 8620 into donut

Merge commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464'

* commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464':
  Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.