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

Change-Id: Ifcb9a5a08af1722bc5df28c470d4ca356b865acb