Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Set Gerrit to 3.0.9
  Set version to 2.16.19
  Set version to 2.16.18

Change-Id: I5e72d7735a962b61982f8e247c7d9050b9174381