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