Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I3239a7f2a650a62180f1ba9d0956efeb743c6ad0