Merge change 27304 into eclair

* changes:
  Fix Cdma re-start of default connection.