Merge "Fix broken test TestIpfwdAddRemoveInterfaceForward in Cuttlefish"