Merge "Add sub-elements for "Variant" type" into qt-dev am: 2322d0f769 am: d185cad4d2 am: 2a6f4832da
am: 68a8affa23

Change-Id: I8f5f94a214382bd28436a5143caa5cfa9844a067