Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d3584 am: 0597a936 -s ours am: d2455f8f Change-Id: I20c7da32465a525b0a0bcd21f862a0a49cf727cb