Merge branch 'stable-2.16'

* stable-2.16:
  Set version to 2.16.13
  Set Gerrit to 2.15.18
  Set version to 2.16.12
  Set Gerrit to 2.15.17

Change-Id: I6b2082ee84b49bc94e01019306127e0d49b229c8