Merge branch 'stable-3.1'

* stable-3.1:
  Set Gerrit to 3.1.8
  Set Gerrit to 3.0.12
  Set Gerrit to 2.16.22

Change-Id: If0003f6faa43476fa76e055b5ff813864f217d93