Merge "Remove the workaround which fixes JOB_COUNT in CTS test."