Merge "Fix Flaky testTrafficStatsForLocalhost" into main