Merge "Correct conversion for TrafficDescriptor"