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

* commit '35a8ae7b734b18740c40d44983ad2536541a2c09':
  Make TSAN easier to use.