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

Change-Id: Iee3991ada4a776ce2f63853e3da49f5c712f06c3