Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Gerrit API to 2.16.17

Change-Id: I5599835a446e37d934c0eabc813974d4bce39786