firewall: nitpicks

Change-Id: I2e572e7aa5f60987f5e5329baf1c827aca45d3fd
Merge "firewall: nitpicks" into production