am 280ebdf2: Merge "Fix image_test for SMALL_ART" into klp-dev

* commit '280ebdf280c435a42b7586466c8317c7cf82beb8':
  Fix image_test for SMALL_ART