Firewall: sync with master

Change-Id: I4e31c3fb28a3ce2fdee2f9592fa635800abea0d3