Merge "Switch from getSpi to getCurrentSpi."