Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: If18c45acb3b9a4ad93ab82b926579554a061bdba