am 6314f0bf: am 456a4516: am a186456f: Safely handle interrupts during Thread.join()

* commit '6314f0bf9b32f5f26b79410b11677184d7d4063c':
  Safely handle interrupts during Thread.join()