Merge "Bug 2361: Added prototype implementation using new SPI."