Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I706ef288f25cfa61fdea4097831f9798a30b1d7d