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

* commit '69c2d5c2ee269f6943e8fe6fb0690e91af640a4a':
  Save config to disk to avoid binding.