Merge "Clean up firewall interface method names." into jb-mr1-dev