Merge "new CarrierIdProvider for carrier resolution"