Merge "Fix races in trace_helper.cc"
am: 718173b770

Change-Id: I6f86ef5bd9c0155b388f6b718e8726f1a2c79365