Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set version to 2.16.17

Change-Id: Ic0e77f34636041ed8eec538c58640bda51177848