Merge "[CTT-3] Add a string converter for TCP and UDP protocol number"