Merge "Lower the aes-xts-plain64 key_size to 256"