Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ie8a465bacd642975f8d73170863416a7ccdf0ca6