Merge "Add tests for TrafficDescriptor APIs"