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

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