Merge branch 'stable-3.1'

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

Change-Id: Icb964912a01adb03f3ad1989835973d08aae705a