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

* commit '9837cfab187dbe5d8bb4146e6b9cead31ac8c502':