Merge "Do not inline rarely used trace function bodies."