Merge "Merge "add a current table in CarrierIdProvider" am: 3fa6fe21 am: 9fce67f5 am: ddf41d99 -s ours"