Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Icb485dadba80fce5f829b0d1dae0a6b725db90eb