Send #18325 to feedback.
Fix a failing test.