Merge change 22127 into eclair

* changes:
  more cdma sms debug logging