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

Change-Id: Ib6d3357df726979e94a6e04a61c4152b91429f6c