Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I23d04993ff6f356297cccb6f4a544a9c9f0dfa43