Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ib5a08e5ea283236093fb5a6d95c8bff855f75375