am 7979f1ce: Merge "Do not inline rarely used trace function bodies."

* commit '7979f1ce5fd771aa9814ef7390f290201ae0790d':
  Do not inline rarely used trace function bodies.