Merge "Fix image_test for SMALL_ART" into klp-dev