Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Id60eae23d8b1eafe8d861161d9accd970fcefddb