Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I753c3f9a0a6cc784a43e6848c9814bf05e57afc2