Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ia1e431279faf836236f3b4f4ec2c8ba8c9022035