am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1

* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710':
  Backup and restore IP and proxy settings