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

Change-Id: Iea074e75c8b78e675f49350d4fe16ccee07a294a