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

Change-Id: Ice5595805d71402bbfbdda2efe44e180f346d54b