Merge "Relax the IP Family check in XfrmController"