Merge "Handle FixUpRemotePointer for external images"
am: 1206a149b4

Change-Id: I16cea2ca95c459527cefa4088ff4c8a1a2acbc1c