Clearing up invalid entries when SyncStorageEngine starts
am: 271702fc28

Change-Id: I4943cf417be41679c2fa332223825dd01a477814