Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-2.16

Change-Id: Ie6a30ab4cf228f6743989669bb8263aec8e369f4