Merge "More small fixes/adjustments to job scheduler." into oc-dev am: 950fa06a29
am: 46c91418e9

Change-Id: Ifef32df2ad01134bed8cb662287ebedd461dcccf