Merge "Clearing up invalid entries when SyncStorageEngine starts am:...

Merge "Clearing up invalid entries when SyncStorageEngine starts am: 5470469d am: bf1b3083 am: 54f494ff am: 4b8fb780  -s ours am: 3f824a36  -s ours am: 467ed9d1  -s ours am: 6a48feaa  -s ours am: 67f43835  -s ours am: 3beb50ba  -s ours am: d5c753a6  -s ours am: 81f4636f  -s ours am: ac5fb9ab  -s ours" into oc-mr1-dev-plus-aosp
am: 43d774fe  -s ours

Change-Id: I38ea28ec556069f44a133096ad3ad6352bb6e3a7