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

* commit '55cd98a0d3c9a60a3d9b12fea0288c0b757a27c6':
  Fix method tracing from command-line