Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Id2d66d65ab0711ecc7a151e0ac14db5c334c8f80