Merge "Fix potential race condition with threads array."
am: d6026cd

* commit 'd6026cde1ef7f2b0abb7a3561510fe83a7dd9de2':
  Fix potential race condition with threads array.