firewall: lint

Change-Id: I7599e04c7844d6d280cb1d67f3abe22d6954de6a
Merge "firewall: lint" into production