Merge "Fix NPE in JobServiceContext" into lmp-dev