Merge change 21919 into eclair

* changes:
  Fix exception when reporting disconn cdma state.