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

Change-Id: Ifb99798a2265b6b2ca39e04275a1074bc0419956