Clearing up invalid entries when SyncStorageEngine starts am: 5470469d am: bf1b3083 am: 54f494ff am: 4b8fb780 -s ours Change-Id: Idaff77e48bf3901ef0cbff54d3ceb19223a48338