Merge branch 'stable-3.1'

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

Change-Id: I855429b2ae203169b68659839f7a0b3bbe703fe4