am 7fde2076: am a76dc41f: Merge "Allow method tracing for run-test"

* commit '7fde2076d8f44ee0e05ceee3f7953113a9d308a6':