Merge "Merge "Clearing up invalid entries when SyncStorageEngine starts" into...

Merge "Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e3822 am: 7d9e8441 am: 25ec2474 am: 4f31a88d am: bf1b7e90  -s ours am: 84aa3f4c  -s ours am: a8e0d5f7  -s ours am: 05c679e9  -s ours" into oc-mr1-dev-plus-aosp
am: f1923717  -s ours

Change-Id: If9a04921915fe00f1fdf9805a2ee33bf22b6356b