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

Change-Id: Id7bd4320a593fa6a05ea2114690d7d9627d3d7fe