Merge "KeyStore: change migrate to duplicate"