Merge "Refactor image loading."
am: 821a512ef4

Change-Id: I44cd62a20303fe025bde1eea0c18d6ed10ef9a99