Merge "Trace.h: explicitly use global namespace" am: a8854d3460
am: 15d5ef59e7

Change-Id: I27b0623a073151b83c73a6fd97865b745826aa04