Merge "Persist data to disk when system shuts down" into pi-dev
am: 29226627d0

Change-Id: I18a5f507f0e50d1212ee40573a3a6a687e5d0052