am dca87543: (-s ours) am 447c7ff8: Make sure configuration is saved to storage device

* commit 'dca875431cdd4a6a1f135ed718ee5ce60e230528':