Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I1e668b2a01ad63ebe96b42c32604ca4a553c0526