Help the cherry-pick for the unit test for TRQ-2347's fix.