am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache"

* commit '4118480aabb4a7b332e289ebb71d2e4f9bc05d7e':
  Solve three memory leaks related to PatchCache