Merge "Remove dependencies from FVP to generic code"