Merge "ART: Fix test breakage"