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

* commit 'ef296b603e0506bdd51638d75e232e8bf62c50f6':
  Save config to disk to avoid binding.