Merge "Fix the redundant use of netaddr.IPNetwork"