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

Change-Id: I68267f21d090a7bf791af374e1fab29ca6193af7