Merge change 22529 into eclair

* changes:
  Track apn Enable synchronously and notice failures