am 5306f5d7: Merge "Fix false alarm on thread suspend timeout"

* commit '5306f5d7e0b4a6ebeacdb8c73bd4335577838cad':
  Fix false alarm on thread suspend timeout