Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update Gerrit API to 2.16.17
  Update Gerrit API to 3.0.8

Change-Id: I235b6cf1a1b9a28c4e2e05381a8763e70a1d207b