Merge "Use TransformRecord to get SPI instead of SpiRecord"