Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update Gerrit API to 2.15.18

Change-Id: Ia61235735555d219f8fa95814da3cd72c3530398