Merge branch 'stable-3.1'

* stable-3.1:
  Update Gerrit API to 3.1.6

Change-Id: I5d958a0ba7016c39b9df6bdb62c79f7f68dd6192