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

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