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

* commit '07de80bd873c80dfcdaed5b992ac0ff01ed41483':
  DO NOT MERGE Race condition in JobServiceContext