Merge "support:design fix possible flakiness in tests" into nyc-support-25.2-dev
am: 80ac519b3e

Change-Id: I057098b125abf8a167a0b246bd4ed475a831a684