Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Gerrit API to 2.16.19
  Update Gerrit API to 2.16.18

Change-Id: I2f505e69a49a9d6b305345b5a2d2e238e95992e8