am ac838a3a: Merge "Correct PatchCache comparison logic"

* commit 'ac838a3ab9d85112576cf2c943930441f62c51d2':
  Correct PatchCache comparison logic