Merge "Fix policy leak by deleting forwarding security policies"