Merge change 23414 into eclair

* changes:
  Fix broken GSM SMS unit test, and general cleanup.