Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I53a0682b74a4e622ab57bee9d4b86709de44a08c