Merge "Fix tracing on user builds"