Merge "Merge "Add sub-elements for "Variant" type" into qt-dev am: 2322d0f769 am: 0a5f121870" into qt-r1-dev-plus-aosp am: ccd6d431d7
am: b47c5d49b9

Change-Id: I69d0d2bcc909bedb56ee069f63cb5782649a2cf9