Merge "refactor(fvp_r): tidy up platform port [1]" into integration