am 7e84b1a4: Merge "Fix NPE in JobServiceContext" into lmp-dev

* commit '7e84b1a4a4e72f1b4953c169cec4599e567c9203':
  Fix NPE in JobServiceContext