Merge branch 'stable-2.15'

* stable-2.15:
  Adapt to the latest Gerrit on stable-2.14

Change-Id: Idc88756deaa419c4ecdfc5663fcd58c14872f941