CBG-3577 Uptake cbgt fix for MB-59249 #8387

Job	Run time
addlicense	20s
build	2m 0s
lint	20s
test (macos)	5m 37s
test-race	7m 57s
test-sgcollect (macos-latest)	20s
test (windows)	10m 23s
test-stats-definition-exporter (macos-latest)	2m 41s
test-sgcollect (windows-latest)	3m 26s
test (ubuntu)	6m 22s
test-sgcollect (ubuntu-latest)	9s
test-stats-definition-exporter (windows-latest)	4m 12s
test-stats-definition-exporter (ubuntu-latest)	1m 33s
	45m 20s

Provide feedback