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

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