Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I2e7d6955c682c59533c46c5f1420dd7bcc36031d