Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b
am: 4f31a88d4b

Change-Id: Ia97ee26a24e49809ad7484f850d256bc733ee239