Merge "Merge "add a current table in CarrierIdProvider" am: 3fa6fe2117 am: 9fce67f50f am: ddf41d99f3  -s ours"