Merge change 542 into donut

* changes:
  enable additional cdma sms fields and user data encodings