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

Merge "Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca am: 53a2e460  -s ours am: 5bd2c48a  -s ours am: 54cbf03e  -s ours am: 88f4c765  -s ours am: 62dbcc9a  -s ours am: 17f0e4bc  -s ours am: f0f1b1fe  -s ours am: 9913314c  -s ours am: 28a1dd26  -s ours am: 976b873b  -s ours am: 174d0688  -s ours am: 93f47a86  -s ours am: 272c482c  -s ours" into oc-mr1-dev-plus-aosp