Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I63e8ee278129c26c88a2c0d92dbdb8f7e694a333