Merge "Remove the carrier config check when setting wfc"