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

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