am 289d1289: am 447c7ff8: Make sure configuration is saved to storage device

* commit '289d1289b5698bfbc81a54e11cea5f10f8a62693':
  Make sure configuration is saved to storage device