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: I73013213812acb1834ae30e0483bbe059890e8db