Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev