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