This will help prevent situations like D4451 where unit tests fail after an upgrade.
The usage of the graviton upgrade for this diff is after-the-fact because the rest of the codebase has
not yet been migrated to the next upgrade name/time, and this allows for easy verification that this
patch works as expected (see test plan).
This patch has only been prepared as a new feature for the CMake build only as we're beginning to
put Autotools on maintenance-only.