Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce  -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b
am: d1150b7e55

Change-Id: Iac842a9f018f24c905d4e165362f5bf87470d296