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

Change-Id: I8118e33279bd74f9e6d5a2232885f1a931d7814d