Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
am: fc9e382229

Change-Id: I80e814ed0266b3868bd7039508bbc50b2e2a51aa