am 9e5599d9: am a76dc41f: Merge "Allow method tracing for run-test"

* commit '9e5599d94e6f918a2cc22a9ba4f2d97fdc69d3ca':
  Allow method tracing for run-test