am 8427c587: Merge "Make TSAN easier to use."

* commit '8427c5878c56c96b9384a89cb6dc00e30cd5bbfa':
  Make TSAN easier to use.