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

Change-Id: I34260f4fd841084a9e91b89905d84004efb40b23