Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set version to 2.16.19
  Set version to 2.16.18

Change-Id: Ib02908749f4060f441ba3a06bbbe3bea77008060