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

* commit '4ef23c58b432d6e45fb485a90070fe2ac751677a':