am a27a67c9: Merge "Fix image loading in interpeter-only mode"

* commit 'a27a67c98e12cd1a90431704a6d7bcbd546667fd':
  Fix image loading in interpeter-only mode