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

* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
  Do not inline rarely used trace function bodies.