Merge "Refine firewall-related commands" am: 7843e757d3
am: 985442370e

Change-Id: I88b93a13b442624ad68eb6fd02d375428ec36e59