Merge "Remove unused enums for firewall in Common.h" into main