Merge "Refactor image object visitors for image relocation"
am: 6b36d8025d

Change-Id: I49ea70198b600dc6cd448e178b176102158ee6bc