am 5e289b2b: Merge "Make patchoat match offset when given a patched image"

* commit '5e289b2bca7a0bc67fcf00a1017d70db8b363113':
  Make patchoat match offset when given a patched image