Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Gerrit API to 2.16.12
  Update Gerrit API to 2.15.17

Change-Id: I4f27f2099d9d78a9a94a944d44d3769ff6556073