Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update Gerrit API to 2.15.18

Change-Id: Id3665cd427f2221ed48fe4cad5738e49fc11b597