Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Upgrade Gerrit API to 3.1.11

Change-Id: I6430357ffe05b2edced27909afbf7b3ce451c4fa