am 23bc498d: am 7b1f6d6e: am 9e5599d9: am a76dc41f: Merge "Allow method tracing for run-test"

* commit '23bc498db86d02ec8fa87c6e5a7d0ec8dd2559a0':