Merge "Improve flaky SiteStatsTest"