am 6ff2a905: Merge "KeyChain: add tests to check key type support" into klp-dev

* commit '6ff2a9059d046b4a23d355cce0018ee3b6b891c3':
  KeyChain: add tests to check key type support