Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev