Merge "Trace.h: explicitly use global namespace"