Merge branch 'stable-3.1'

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

Change-Id: I6114cb6f62480cf6f6061f3cbdc4b3f9b0a3ca84