Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ib843d09588f0c91d1b86593ba7cfc41c8da79325