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

* commit '0e22f8e9cadf58c7620893d5ac73e963eda38f21':
  Save config to disk to avoid binding.