Merge "Added validation for protocol field while adding flow"