Merge "Replace OperatorInfo with operatorNumeric for network selection"