Merge "Fix JobScheduler tests."