Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: If6adc8076ec37d8e5174466dbfdcbe8a9b7601d2