Merge "Attempt to de-flaky GraphicStatsValidationTest" into oc-dev