Merge branch 'stable-3.1'

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

Change-Id: I9d7cbd7a6aefdcaf4a7327588d79f58127663f34