am ef65477: Merge change 844 into donut

Merge commit 'ef65477523a6170bab7897809d1a8f9a3f5165f6'

* commit 'ef65477523a6170bab7897809d1a8f9a3f5165f6':
  clean up cdma sms creation and parsing