Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Adapt to new ProjectCache interface

Change-Id: I10fb30da6dbe83b05cbaef1675ec28de93c5591b
Depends-on: https://gerrit-review.googlesource.com/c/gerrit/+/324315