Merge "keystore: change migrate to duplicate"