Merge "move column defs to Telephony.CarrierIdentification"