Merge "Refactor some patching logic"
am: ed42f392f9

* commit 'ed42f392f9ae19d24ed2e18b60e146da3920cbf9':
  Refactor some patching logic