Fix a bug firewall rule creation fails with ANY protocol

Change-Id: I9dc92becd748008e3981126d90feaec7b7c8882f
Closes-Bug: #1229543
Merge "Fix a bug firewall rule creation fails with ANY protocol"