Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ib1d77ba86aa3c6b928c6316a8e3b0a44b0ba3b14