Merge "Fix BstatsCpuTimesValidationTest" into main