Merge "Fix JobSchedulerTest."