Merge "Update relocation packer" am: 1ecf5205db am: f8e30c61e4
am: e7840e43ab

Change-Id: Ia517c93e46cbc9de4e007cc5067b8b82f8f41ae8