Merge "Fix deadlock/timeout in thread unwinding." am: 3c9cd8a29d

Change-Id: I9069f1da5f71f69361a3273242d0d698aa37b2ab