Merge "Fix JobSchedulerService FBE regression." into nyc-dev