Merge "Revert^2 "Refactor image loading.""
am: 99d31998b6

Change-Id: I7f239317ce735add12ae9932f28088ec876fc103