Merge change 26171 into eclair

* changes:
  Fix several CDMA call collision cases