Merge "ART: Resolve ambiguous ArraySets"