Merge "add a current table in CarrierIdProvider"