Merge branch 'stable-3.1'

* stable-3.1:
  Update Gerrit API to 2.16.20

Change-Id: Ibe2636cb57eac7001aa0636e64715ea06f687969