Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set Gerrit to 2.15.16
  Set Gerrit to 2.15.15

Change-Id: Ib756fda7a0131fb31a1f309438d4f07ede0834ea