Merge branch 'stable-3.1'

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

Change-Id: If9f0bdacea95d6351384b0e46eb7cd1353085bcf