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

Change-Id: Ia9fcf1a9cda8a0711f703f445295d258f759b0bb