Merge "ART: Fix performance-inefficient-vector-operation"