Merge "build(fvp): make all builds unconditional" into integration