Merge "Fix job duplication bug" into nyc-dev
am: 24fb1f6

* commit '24fb1f6842315b827a7c9578f45881f62608223d':
  Fix job duplication bug