Merge branch 'stable-3.1'

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

Change-Id: I79dab9f0ac97e60a5a999fbaa18ac7fc837e2aaf