Merge branch 'stable-3.1'

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

Change-Id: I4c1eb4879dc7a8c9c5ec7e0c2d4c4da4b2e4bfcb