Firewall improvments

Change-Id: I14c922e6efe2f4b4f22e0d416b2318af25c6e086