am a534eea1: am 16fc9f61: Merge "Runtime can now be set to require relocation"

* commit 'a534eea11b9642471f144a5d892fe3d9ad036b3f':
  Runtime can now be set to require relocation