am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job."

* commit 'a51f14d00edda3da103585bf7741502e866512e8':
  Fix NPE in JobServiceContext when closing job.