Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I1cf129ea0324bf736e06e6062fb26c271e946541