Merge branch 'stable-3.0'

* stable-3.0:
  Update Gerrit API to 2.16.12
  Update Gerrit API to 2.15.17

Change-Id: Id43d0ff7d3a91b3b8d59f5ac14dab8c432469ce3