am e579dc1c: am 997eddb0: Merge change 24318 into eclair

Merge commit 'e579dc1cc55648c3b8b81560214c47c9adee81f1'

* commit 'e579dc1cc55648c3b8b81560214c47c9adee81f1':
  Avoid CDMA messages with IDs of zero.