Merge "CarrierIdProvider improvements"