Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev am: fa791d5e97
am: 3049791af6

Change-Id: I365ad8998a11579b50f4a6b6b1ec3ec5f2e416d1