am 6b28a456: Fix stack overflow and duplicate methods while tracing.

* commit '6b28a456b075fe53dfb7e924a44dbf35d0d41eb3':
  Fix stack overflow and duplicate methods while tracing.