Merge "Adding helpers to save and restore config." into mnc-dev