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

* commit '0f635b103c1fff6439d47bdae363afeffe7327fd':
  Fix method tracing from command-line