Merge branch 'stable-3.1'

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

Change-Id: I94b365f3137aaa626833eac6f47386e250555e26