Merge "Skip curve25519 upgrade tests on KeyMint v1"