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

* commit '5857bad032ab01736ec30207c12a3625ca0536ad':
  Make patchoat match offset when given a patched image