Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f
am: 53a2e46036  -s ours

Change-Id: Ic0fa17750a252a75912c4a2da73d45ff9a9fea1d