Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I1301a707a565ed91b9aa451c74fac8c9371d4c84