Merge "Refactor image relocation"
am: c99f0174de

Change-Id: I7583f840dc9f568e53a815f98ac758940d57bd19