am 7c2c52b2: Merge "Disable tracing if enabled by default for new tracing test."

* commit '7c2c52b2276c97b6a0db973a3a3e784e3d4bed24':
  Disable tracing if enabled by default for new tracing test.