Merge "Refactor: Pull tracing out of TimeStats."