Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set version to 2.16.16
  Set version to 2.16.15

Change-Id: Ie273d0507d40591738c803bc878068a004784d1f