am d5cd8bc8: Merge "Avoid race in single thread suspension."

* commit 'd5cd8bc88d60f4e516e3441651f35c183131e318':
  Avoid race in single thread suspension.