Merge "Fix GraphicsStatsValidationTest"