Merge "Move tracing log prints to inside Trace()"