Merge "refactor(fvp): move cpus with nomodel" into integration