Clean up remaining `TODO(GA)` from PR#3082 (#3245)

## Motivation and Context
This small PR cleans up remaining two `TODO(GA)` in #3082.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._