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

* commit 'd7015d1290a1d2c4acd6c887a09896d7503c33de':
  Fix false alarm on thread suspend timeout