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: I80f334a77e22f0423ad29ace0dd8d966a8318b81