Merge "Refactor some patching logic" am: ed42f392f9
am: faaa970d00

* commit 'faaa970d00a0542326b94e58702856aaa9feaa91':
  Refactor some patching logic