Merge "Allow globally disabling the relocation packer." am: 6d6ba8aaf1
am: 18ace0f2fe

* commit '18ace0f2fe1df46aade8cd818b169623005d6054':
  Allow globally disabling the relocation packer.