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

* commit '90fa15ff05fd6ea2e961351c7236e7fe753c79d8':
  Refactor some patching logic