Merge change 844 into donut

* changes:
  clean up cdma sms creation and parsing