Merge change 26286 into eclair

* changes:
  Resolve race conditions with disconnect of CDMA data and airplane mode