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

Change-Id: Iea94adf289131ba919a7e56510fe407753a02764