Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958
am: 57bbf9bb9c

Change-Id: Ia3f528efeaca69830c1a858e6c4637690c70062a