Merge "Refactor Networkmodel PortMappingListener"