Merge "Remove unnecessary lookups during relocations"