Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I3ef448832d9ceeb8aea5ecb593b17224af101dae