Merge "Fix JobSchedulerServiceTest." into rvc-dev