Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set Gerrit to 2.16.14

Change-Id: I8249e1f92c1fab551052a735ef1f69272ddd1253