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

* commit '87092929a02a88730a60e7edf85539c3711c23f8':
  Fix NPE in JobServiceContext