Merge "ART: Fix GenReduceVector and GenSetVector"