am 5e42cd3e: Merge "Wait for threads to finish unregistering"

* commit '5e42cd3eee2c89214a331a36fe226cfcc57917a3':
  Wait for threads to finish unregistering