Description of changes:
Cherry pick from develop into 1.20.x for 1.20.2
Testing done:
cargo make -e BUILDSYS_VARIANT=aws-k8s-1.29 builds without error
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.
Issue number:
4043
Description of changes: Cherry pick from develop into 1.20.x for 1.20.2
Testing done:
cargo make -e BUILDSYS_VARIANT=aws-k8s-1.29
builds without errorTerms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.