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

* commit '466a0cdfe3bd67e542714132de4bbe5661df2f5a':
  Avoid race in single thread suspension.