Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade bazlets to latest stable-2.15

Change-Id: I45ba5ba34f7eda27d523de805db91cf889b9b65b