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

* commit '6ea35520fd03473e1aac176ecd47d81c673691a7':
  Do not inline rarely used trace function bodies.