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