Merge "Update relocation packer"