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

Change-Id: Ie4cf94614784c4938776c8c6c37fff64e6cfa240