Merge change 25109 into eclair

* changes:
  Some SMS logging improvements.