Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Iaff36a740e17a5e0e5d5c4d088e86cd635522d26