Merge "Migrate PeriodicSyncs from old format" into nyc-dev am: 3e09cd4d79
am: ececd95edc

* commit 'ececd95edc08d0ef48141f6226bbc8bd35a272d0':
  Migrate PeriodicSyncs from old format