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

Change-Id: I669966eb694623fe3052db84dd1dc6375e1bfde9