Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629  -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4 am: 2bded32359
am: da605f5a0e

Change-Id: Ifbb088171def4c9ecfc723f6aa3fd44fe3e4c091