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

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