am a760f387: am 80a8786e: Merge "Revert "Save config to disk to avoid binding."" into mnc-dev

* commit 'a760f3876dab929cf002b26b8b43f967f5e40ac9':
  Revert "Save config to disk to avoid binding."