Merge change 24318 into eclair

* changes:
  Avoid CDMA messages with IDs of zero.