Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ib3cd37aa59d5ce0a10a688ccd2f853fd791eb245