Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I5dad257ff865fe4fa36d752ba356c307dbdaa620