Merge "Firewall-related commands porting" am: 1acfa7de1b am: 6ba18c6b03
am: b87796365e

Change-Id: I3a2d3115a9664fd2be458076d7a7092a7cb5293c