Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Gerrit API to 2.16.23

Change-Id: Ibff210ae0616cd63a74ece2f541d9d93d29c9f69