The TODO was added by an external contributor from the test org. The contributor is not available for the proper fix, so leaving the workaround as is.
Bug: 225505986
Change-Id: I4d94214f36a4d927546d87f01c924db82fbbe898
Test: presubmit
Flag: NA test code