Merge "Fix races in trace_helper.cc"