Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set Gerrit to 2.16.22

Change-Id: I81a9e12d288ed8dd076595a2d0407e6a88408318