am e689c8a4: Merge "Fix test 104 for --relocate --no-patchoat"

* commit 'e689c8a41355621e1a4c738ffb9d527e2a567b80':
  Fix test 104 for --relocate --no-patchoat