Merge "Switch from getSpi to getCurrentSpi." into mnc-dev