Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I1bd4cc08356f6926a58b4e98f0743740545b49cf