am c470aefe: Merge "Fix occasional long ThreadSuspendSleep"

* commit 'c470aefe5abb9ab0b209c7c99139734efe97b177':
  Fix occasional long ThreadSuspendSleep