Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours
am: 5bd2c48ac0  -s ours

Change-Id: Ib09d2326565a43d3ff0c4d0a88041703658a8804