Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e3822 am: 7d9e8441 am: 25ec2474 Change-Id: I858f75717157bd9269bcd43d4198935302132d5a