Merge "ART: Fix multi-image testing"