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

Change-Id: I440592a5d4cf625399503765162d534a72ba4b55