Merge "Fix GraphicsStatsValidationTest" into pie-cts-dev