am 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."

* commit '7616909b5e24289eb7caecb4708f0c69a09a26f9':
  There's no such thing as _THREAD_SAFE.