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

Change-Id: I8600883ef4cad6f8b11fc005fc9cfd62d84aeb08