am 3adbe79d: am 66e31dc5: am 3a088524: Merge "Rewrite unwind thread handling."

* commit '3adbe79d2f14665ff55a9b0db245abebc105658d':
  Rewrite unwind thread handling.