Merge "Restrict range of sync job ids" into nyc-dev