Merge "Add sub-elements for "Variant" type" into qt-dev am: 2322d0f769
am: 0a5f121870

Change-Id: Ie5b5e6e675022ba97ab1151de66e5b69ecc06e42