am 070dfc4c: Merge "Fix tracing."

* commit '070dfc4cebb9772a646382be9751d8f4c6b7d69a':
  Fix tracing.