Fix cherrypick demo #5386

Job	Run time
check-required-label	8s
check-required-label	3s
check-codebase	13s
check-codebase	13s
Integration Tests - git 2.20.0	1m 7s
Integration Tests - git 2.20.0	1m 7s
build	1m 9s
build	1m 9s
Integration Tests - git 2.22.5	1m 0s
Integration Tests - git 2.22.5	1m 0s
lint	36s
lint	36s
Integration Tests - git 2.23.0	1m 7s
Integration Tests - git 2.23.0	1m 7s
ci - ubuntu-latest	35s
ci - ubuntu-latest	35s
Integration Tests - git 2.25.1	1m 10s
Integration Tests - git 2.25.1	1m 10s
ci - windows-latest	2m 18s
ci - windows-latest	2m 18s
Integration Tests - git 2.30.8	1m 8s
Integration Tests - git 2.30.8	1m 8s
Integration Tests - git latest	58s
Integration Tests - git latest	58s
upload-coverage	30s
upload-coverage	30s
	23m 53s

Provide feedback