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

* commit '7443e598daef5ea58580086d7e9ec28298a85272':