Merge "Keystore 2.0 SPI: Fix bug in chunked streamer."