Fix persistence.

Change-Id: I7777467b3c24f7897c2b19a60a1c8b0a5e2f8fbc