am 560473c7: Merge "ART: Fix multi-image testing"

* commit '560473c74cc3755b652f86a61039e4a12c08afe2':
  ART: Fix multi-image testing