Merge "Firewall-related commands porting"
am: 1acfa7de1b

Change-Id: Ibfa52e38d5ca61036458ad2ce21aa3223cb9f7c5