am d306052: Merge change 542 into donut

Merge commit 'd30605200b8b0f10e4740a9d7266d240023e69cd'

* commit 'd30605200b8b0f10e4740a9d7266d240023e69cd':
  enable additional cdma sms fields and user data encodings