Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ib2b7b91c8663144dedb371e605781ede0245136c