Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours am: 54cbf03ecb  -s ours am: 88f4c765a6  -s ours
am: 62dbcc9af0  -s ours

Change-Id: Ica4728bb090b2653d47308848ef8f771154879ca