am c860df11: am 0f635b10: Merge "Fix method tracing from command-line"

* commit 'c860df11e6ed9d4af599a28c484ecf692db9b541':