Merge "Add sub-elements for "Variant" type" into android10-tests-dev