Merge "IPACM: Fix IPv4 firewall not working issue"