Merge "Carrier ID table rollout"