Merge "Work on issue #62095840: NPE in JobParamteres in the background" into oc-dev
am: 1399d3abf5

Change-Id: I49169ce6f6559d9bfad36693b1582b2d810380b6