am 3b7c0cdb: Merge "Save config to disk to avoid binding." into mnc-dev

* commit '3b7c0cdb6ec222bf6a3f615c878b8159f36958e4':
  Save config to disk to avoid binding.