Merge changes Id58dfa68,I42c6dea6

* changes:
  Keystore 2.0 legacy wrapper: Fix copy past error.
  Keystore 2.0 legacy wrapper: Fix hardware info.