Merge "make NUMERIC field null in case mcc/mnc is not defined"