Merge "Refactor image relocation" am: c99f0174de
am: 67983415d3

Change-Id: I8c727077a53673c4b185f61f7e5f8c6c1632cb34