Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update bazlets to latest revision on stable-2.15
  Update bazlets to latest revision on stable-2.14

Change-Id: I5a2cca12525e260e7f28baf9c943080707df7763