Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Gerrit API to 2.16.22

Change-Id: I74b63b1ea74fd35a2d8f0306a799216f7c16e7d1