am 322c2dad: am c470aefe: Merge "Fix occasional long ThreadSuspendSleep"

* commit '322c2dad3ec8464bbf685d3303bdc0a89fb4f654':
  Fix occasional long ThreadSuspendSleep