Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f am: 07de80bd87 am: 4e18ec7343
am: f012481a44  -s ours

* commit 'f012481a4442cb0289a7d77444c59d7f0041eb18':
  DO NOT MERGE Race condition in JobServiceContext