Merge "Cipher: always select a SPI in init according to the parameters"