Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I2323eb6af2418bd6165be41da5f8fb18bb98052b