Merge "Introduce a new JobServiceEngine class." into oc-dev