Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ib3621c1d416d850f0e4e0c443b2fdf844cf295f4