Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update Gerrit API to 2.15.17

Change-Id: I78fa9433fc1be0452197dba9c384f78264fd0118