Merge "refactor(fvp): add missing header guard in fvp_critical_data.h" into integration