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

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