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

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