Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I29b07a9a2b2591a5821e65c9b622eaff2f8b7b08