Merge "Carrier identification config updater"