Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I11b7ac3c917e62447d9e699ab65e8ab852be55a4