Merge changes I316fdb8b,I99c1bd49

* changes:
  Keystore 2.0 SPI: Public key operation workaround.
  Keystore 2.0 SPI: Bug fixes