Merge "KeyMint: tweak spec to allow for no v4 in V" into main