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

Change-Id: Iabfc6ed7f634fde84bc348fae81baf9bbea001e6