Merge "Migrate PeriodicSyncs from old format" into nyc-dev