Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB"