Merge change 22093 into eclair

* changes:
  cdma sms encoding tweaks and logging / debugging annotations.