Merge "KeyMint: new version number in attestation"