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

* commit '325fa7818813d88814c2ee44d588549dba757e28':
  Fix NPE in JobServiceContext