Merge "Revert "Fix encoding of PubKeyEd25519""