Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Id794f2e61b576fe65ee2c6003e983560e10e7da3