Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I9d65ae7e8fa287ef277dea5643c6b4abc6d90494