am 4936b689: Merge "Remove test_thread_max."

* commit '4936b689521aa10882b6b59afc4b812dd413b56f':
  Remove test_thread_max.