Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update Gerrit API to 2.16.20

Change-Id: I22ae00b586a8dd77c905b5bb159c9c9b7fcd4f93