Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I51fae4131174d9dd5a3176beeeefc38d59d49b7c