Merge "libpdx: Fix bug in Variant type."