Merge "Keystore: Support Ed25519 keys" into tm-dev