Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036  -s ours am: 5bd2c48ac0  -s ours am: 54cbf03ecb  -s ours
am: 88f4c765a6  -s ours

Change-Id: Ia620503c958f9b1b2f44f2e99ba47d36bb558e0f