am 42457027: Merge changes I65f7a915,I32098dc0

* commit '424570273bc225edaf7425385812b173adeb8695':
  KeyStore: add "migrate" command
  KeyStore: add API to uid versions