Merge "Add updateFirewallRule API"