Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I1f318fbe6ca1221d54c24b6ccf174129c0842cb5