Merge "firewall: fix inbound IPv6"