Merge "Carrier ID table rollout latest_carrier_list_rollout_20210518"