Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ic42f5e71ab3c0ff5282c88f6fecbb5ae59966ac4