Merge "Handle updating the carrier configuration"