am 65d99c3c: Merge change 7537 into donut

Merge commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83'

* commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83':
  Fixing a race condition that causes synthesis to not be aborted