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

Change-Id: I38aa37e0efce52226c5844d25d558696a1af9a37