am 0354e68a: Merge "Fix method tracing\'s handling of shadow frames on startup."

* commit '0354e68a9b5214af0a633e05c48566ebaf5b6833':
  Fix method tracing's handling of shadow frames on startup.