Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update Gerrit API to 2.15.18

Change-Id: Ieb4037206d4186b8efe30559af614af03168b312