am f2eae8a3: am 6875de5f: Merge "Update relocation packer"

* commit 'f2eae8a3d50db6b9b1209c5b6382bc6edf4cfdf4':
  Update relocation packer