e0129b3c67
Bad files and OS updates can cause the restore to throw an NPE. Rather than bring down the server process over this, just delete the persistent file and keep going. Fixes bug 15219594. Change-Id: Id9cd39988ff93a26def036a05c46209364f2a4c0