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

Change-Id: I399fdbe691b4d8a70fbc671e8f32fa842247d9df