Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28
am: 8b438236ce  -s ours

Change-Id: Ib8c3a4e6e8e39e42aa640c9988d0dd2022f486ec