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

* commit '4e18ec7343ff91f0112dc0fedab6ea720857a6f5':
  DO NOT MERGE Race condition in JobServiceContext