Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Iea2dbdf0a0ab074ebeb0bf4a3991340305cfe511