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

Change-Id: I48faa5180dd6690b7a93154294402f7bf468a4ef