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

* commit 'e44bb0506f6413d0999800d46610383bfab7d20a':