[automerger skipped] Merge "Persist data to disk when system shuts down" into pi-dev am: 29226627d0
am: 560055e29d  -s ours

Change-Id: Id4a0549d14b3b94bb35683d236d2e1059d230ad0