Merge "Add interning support to NetworkTracing"