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

Change-Id: Id776a47b42146f8d9ba4419ee8872ebefac84ed3