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

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