Merge branch 'stable-3.1'

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

Change-Id: I3280387068150a136c6f12304e8751d073b251a2