make firewall management optional

Change-Id: Iccdd5d17205bd783e053551e5a2ec7fc8cabef13
Merge "make firewall management optional"