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

Change-Id: Ic20b237e575e1b71c844506d014e3ac409430130