Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I971337fe7f3bfebc87e3156d69b902606df963d8