Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I2cee197d1109fea29f95979377c51af6391b4676