Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I17ecc4873e1d54ebfc7db76f91a8b8fc798a883c