Merge "fix(cpus): fix cpu version check for Neoverse N2, V1" into integration