Merge "Key{Mint,Master} VTS: fix incremental AES tags"