am bda3e26f: am 42457027: Merge changes I65f7a915,I32098dc0

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