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

Change-Id: Ie385ab8acb34e3eb1071982e23fd89f47356ccbc