am 5af1943e: Merge "Wait for threads to finish in ThreadsTest before continuing"

* commit '5af1943e8c341c92ca11fb2b141cd0f1a0c1d105':
  Wait for threads to finish in ThreadsTest before continuing