Merge "Downgrade IMapper and IAllocator to @2 for fvp"