Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ic49060b4ac0aa3c09b024755a5a779bab2107783