Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Gerrit API to 2.16.20

Change-Id: I3a933106ffb906e1e5201ec5db2764b6048933e2