Merge "Revert "Refactor image loading.""
am: f345404c72

Change-Id: I9e558909440cd2d94e9584bab3046079d3fe96d9