Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0
am: 4b8fb78007  -s ours

Change-Id: Idaff77e48bf3901ef0cbff54d3ceb19223a48338