Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I7a5bdb77f55c8d0ca3700a04b5d06d2776ee5ca9