Merge "Fix issue #38210653: Few more tweaks of job scheduler" into oc-dev am: c75bd416e9
am: 48e6d1594a

Change-Id: I41a97e988da5069fc186307e519e07e2bb746e83