Clearing up invalid entries when SyncStorageEngine starts
am: 89c0dbca0f

Change-Id: Ib6a256a22d703feae8067366d8dc2622593c1142