Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I6b2cc4be0730f83f798a932529f5d9e743b2ca86