Merge branch 'stable-3.1'

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

Change-Id: I8517f4ae241974a4f026ba21ad6a084d77599637