Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I84620ec94854ebfa58a5e5534f1fb99434f37e13