Merge "Handle FixUpRemotePointer for external images"