Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I42ef0786a8fcea6c787cbef394a4082a0a2cb614