Merge change 24754 into eclair

* changes:
  Handle secondary APN connect failures.