Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I61e72f9d9a29585011706f30f5bab64cd5d25b31