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

* commit 'f46d500984e2a6eb18a153d0ca41a0f8851d2e60':