am 6875de5f: Merge "Update relocation packer"

* commit '6875de5fd270d6d8e6e0a2a723c1831c236a03fe':
  Update relocation packer